Auto merge of #2003 - cesarb:issue-587, r=alexcrichton
authorbors <bors@rust-lang.org>
Sat, 26 Sep 2015 18:03:39 +0000 (18:03 +0000)
committerbors <bors@rust-lang.org>
Sat, 26 Sep 2015 18:03:39 +0000 (18:03 +0000)
commitc76e9d13db3fac1f234777c462469cb2bc49ee17
tree8c8b4510bb505eebd9a2b701a95f950c0d799dca
parenta7b2c92ccaa8d3bee2943fdc7976840402fb64ae
parent5d5d8638605c60e82a0b59ee8b08b99607f3384e
Auto merge of #2003 - cesarb:issue-587, r=alexcrichton

Based on rust's mk/reconfig.mk

Fixes #587 and #1993